From 64313f4a4b8fe3636ef5fb13894885744ebd52f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Mon, 18 Jun 2018 19:39:32 +0200 Subject: [PATCH] themes: Don't handle box.linked special We don't reverse the css nodes anymore in RTL layouts. --- gtk/theme/Adwaita/_common.scss | 17 ++--------------- gtk/theme/HighContrast/_common.scss | 17 ++--------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 6317fdb930..a9b9223fac 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -949,23 +949,10 @@ toolbar.inline-toolbar toolbutton:backdrop { border-right-style: solid; } -// .linked assumes Box, which reverses nodes in RTL, so 1st child is always left +// 1st/last child are at text start/end %linked { @extend %linked_middle; - &:first-child { @extend %linked_left; } - &:last-child { @extend %linked_right; } - - &:only-child { - border-radius: 3px; - border-style: solid; - } -} - -// Other widgets use widget child order, so 1st/last child are at text start/end -%linked_flippable { - @extend %linked_middle; - &:dir(ltr) { &:first-child { @extend %linked_left; } &:last-child { @extend %linked_right; } @@ -1717,7 +1704,7 @@ headerbar { // headerbar border rounding // can’t simply remove .linked from the widget as that might break other themes. // Note also we select on filechooser to avoid interfering with NautilusPathBar. filechooser .path-bar.linked > button { - @extend %linked_flippable; + @extend %linked; } .path-bar button { diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index 2b2f427ee3..afa5f5ab54 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -757,23 +757,10 @@ toolbar.inline-toolbar toolbutton:backdrop { border-right-style: solid; } -// .linked assumes Box, which reverses nodes in RTL, so 1st child is always left +// 1st/last child are at text start/end %linked { @extend %linked_middle; - &:first-child { @extend %linked_left; } - &:last-child { @extend %linked_right; } - - &:only-child { - border-radius: 3px; - border-style: solid; - } -} - -// Other widgets use widget child order, so 1st/last child are at text start/end -%linked_flippable { - @extend %linked_middle; - &:dir(ltr) { &:first-child { @extend %linked_left; } &:last-child { @extend %linked_right; } @@ -1319,7 +1306,7 @@ headerbar { // can’t simply remove .linked from the widget as that might break other themes. // Note also we select on filechooser to avoid interfering with NautilusPathBar. filechooser .path-bar.linked > button { - @extend %linked_flippable; + @extend %linked; } .path-bar button { -- 2.30.2